From 1b336983842d302f6898f700e96512f163eda498 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Tue, 7 Dec 2010 14:09:26 +0900 Subject: [PATCH] Revert "Temporary fix to make separator rows request enough space for the expander size." This reverts commit 515af9ce702d77c5d1ab0a089c51564c31cd2247. --- gtk/gtktreeview.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index c2a611ccd5..d6e290dff9 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -6148,6 +6148,7 @@ validate_row (GtkTreeView *tree_view, { row_height += vertical_separator; height = MAX (height, row_height); + height = MAX (height, tree_view->priv->expander_size); } else { @@ -6157,10 +6158,6 @@ validate_row (GtkTreeView *tree_view, height = 2 + 2 * focus_pad; } - /* XXX Expander size is also used to draw the separator rows, - * maybe that should not be the case ? */ - height = MAX (height, tree_view->priv->expander_size); - if (gtk_tree_view_is_expander_column (tree_view, column)) { padding += horizontal_separator + (depth - 1) * tree_view->priv->level_indentation; -- 2.30.2